st/icon-theme: Remove special-casing of symbolic lookup

GThemedIcon considers the "-symbolic" suffix when generating
fallback names (i.e. "foo-bar-symbolic", "foo-symbolic", "foo-bar",
"foo").

That means now that we prefer more accurate name matches from any
theme over fallback matches from higher-priority themes, we no
longer need to special-case symbolic names for preferring symbolic
matches over full-color fallbacks.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2824>

diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c
index 4b04264ebf3ac3931b34b16eb23ee2f4b3bf384e..432afdce4ae52f734e684fc923b3bf270ad4d6a2 100644 (file)
--- a/src/st/st-icon-theme.c
+++ b/src/st/st-icon-theme.c
@@ -1293,28 +1293,6 @@ real_choose_icon (StIconTheme       *icon_theme,
   else
     allow_svg = icon_theme->pixbuf_supports_svg;
 
-  /* For symbolic icons, do a search in all registered themes first;
-   * a theme that inherits them from a parent theme might provide
-   * an alternative full-color version, but still expect the symbolic icon
-   * to show up instead.
-   *
-   * In other words: We prefer symbolic icons in inherited themes over
-   * generic icons in the theme.
-   */
-  for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i]); i++)
-    {
-      icon_name = icon_names[i];
-
-      for (l = icon_theme->themes; l; l = l->next)
-        {
-          theme = l->data;
-
-          icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg);
-          if (icon_info)
-            goto out;
-        }
-    }
-
   for (i = 0; icon_names[i]; i++)
     {
       icon_name = icon_names[i];